Merge "Fix errorprone warnings that should be errors" am: edceea23f4 Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2256437 Change-Id: I77233169e192bd70b4d32489900e69453710f82b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>